Merge "Configure /system/apex/com.android.runtime.[debug|release]/bin/*" am: 186661d135 am: 6649f7447e
am: b97eeb34c4

Change-Id: I458be6713e141bdb8848c3a2b993aa9adbd9787d