Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Add extra checks and timeouts to account migration. DO NOT MERGE

Change-Id: Icfc43ebf3b0da16344030210dffc04f99e6a47e7
tree: d422535bf98852f415f7a88378a4d3e2df04b0a2
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. CleanSpec.mk