Android R Beta 2
Merge "Import goldfish soong namespaces to mini_common.mk" am: 6c45a6eab2

Change-Id: I1ef80e9defae8c1b7ec4ef7479c4201fe7ab72b9