Merge \\\"Allow prebuilts to specify mini-debug-info\\\" am: 4ea20be28b am: d5c3e04c85
am: 6fb6459157

Change-Id: I2f5470cbc730d786f79dabd509e392222af4b3cf