Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Fix copying of cached map data.
  Verify section table name size before strcmp.

Change-Id: I78b3fd868df8b9b9deedf6f9b0569a7b4e1498e2