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

Change-Id: Iefec308995540cb8c6155c356b60e98b68774c0e