Android S Preview 1
[automerger skipped] Merge "Import goldfish soong namespaces to mini_common.mk" am: 6c45a6eab2 am: d511509153 -s ours am: ebd337c459 -s ours am: 5d7dad5a8e -s ours

am skip reason: Change-Id I58e0b35fd548b42717d333682fb1f5653424777c with SHA-1 31a435732a is in history

Change-Id: Ifc98c4949f26b13e69f92b47e5d4632f0340f89a