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

Change-Id: I061f5e19b987b179050b5f3beaedc9d77cc5a031