Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3': (50 commits)
  "MMB29M"
  Revert "Change version back to 6.0"
  "MMB29L"
  Change version back to 6.0
  "MMB29K"
  "MMB29J"
  "MMB29I"
  "MMB29H"
  "MMB29G"
  "MMB29F"
  "MMB29E"
  "MMB29D"
  "MMB29C"
  "MMB29B"
  "MMB29"
  bump version to MMB28B
  "MMB28"
  "MMB27"
  "MMB26"
  "MMB23"
  ...

Conflicts:
	core/build_id.mk
	core/version_defaults.mk

Change-Id: I931e90e3ff944229eb1f2972aa852e1e00c28ed9