Merge tag 'android-5.0.1_r1' into HEAD

Android 5.0.1 release 1
tree: a19bad3406791bc4af4432a3a549ca5e16a03704
  1. proguard.flags
  2. res/
  3. src/