fwb: Merge tag 'android-5.0.1_r1' into HEAD

Android 5.0.1 release 1

Change-Id: I21d6f3ab4f2f1ae89aea1f9e218c1c184e198204