Merge "Convert libandroid and libandroid_runtime to Android.bp" am: d308803b82 am: 06a6e81c1d
am: fb18f4cfed  -s ours

Change-Id: I8b61ee0eedd7c0c9b217ab943200db330925bd0e