resolved conflicts for merge of 6a9e1f6c to master

Change-Id: I8b985b27c132bf0808fbe4c0e7a095891e45a97a
tree: a671349000e1d3310bdafc3d153f04b8bfb0b487
  1. AndroidProducts.mk
  2. BoardConfig.mk
  3. mini_x86.mk
  4. overlay/