flo: Merge android-5.0.0_r5 tag into HEAD

Change-Id: I17fb6a74f2aa8c487ed1947198da77a815be48b2