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

Change-Id: Ib04a1705ba25e346c432802166df4af5c4a72b86