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

Change-Id: I9c20ce0f37ec734a799c61ee3a95ff28536f0d4a