flo: merge tag "android-5.0.1_r1" into HEAD

Change-Id: I588b5946019d0777faacc2bad2b7cdd433c0ff3e