Android 6.0.0 release 6
resolved conflicts for merge of 602eaa3d to master

Change-Id: I034975354c25efd940af7a459d90962bb81e031e
tree: fef6bdd9ca2927cb9681d8210e106e259f811913
  1. overlay/
  2. AndroidProducts.mk
  3. BoardConfig.mk
  4. mini_mips.mk