Merge tag 'android-5.0.2_r1' into merge_branch

Android 5.0.2 release 1

* tag 'android-5.0.2_r1':
  tilapia: emulate sdcard using 4 threads
  tilapia: chown and chmod core_lock_{count,period} sysfs files
  Ensure /radio directory exists in recovery

Change-Id: I61a174577d8068d9794eb5b3f68d11dfaccf5ccf