Merge "Add explicit ABI / instant app options"
am: 5948f48fac

Change-Id: I46b7caccf41a1345ebb85e39e9a302ef50ecd069