Merge "Make some build targets visible to art sdk"
am: 0ca8d7a437

Change-Id: I2fc770ffb98e8cfc658acdf3ab0ed3efdbb61d03