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

Change-Id: I41121a2d65b08ed6d81a9831d20e933bf01585a7