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

Change-Id: Ie45c0f0235fed8a4005110d7a8e794644defefdd