Merge "Convert libandroid and libandroid_runtime to Android.bp"
am: d308803b82

Change-Id: I90804cba65863d6194d7dd683024b43297357f19