Merge AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.01.00.081.014 on remote branch

Change-Id: I2267519b007a3f03b1564cb2ab06590259a52f2e