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

Change-Id: Ib613e9f89275c2af534c0b341f6c1c14c9af819a