Merge commit 'd62ad4f120e92fd597f44caf125ac853ac0ea11c' * commit 'd62ad4f120e92fd597f44caf125ac853ac0ea11c': Fix issue #1859814: Add android.os.Build.MANUFACTURER
Merge commit 'd62ad4f120e92fd597f44caf125ac853ac0ea11c' * commit 'd62ad4f120e92fd597f44caf125ac853ac0ea11c': Fix issue #1859814: Add android.os.Build.MANUFACTURER