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

Change-Id: I91dae6b09ae0b76905f2b8ea2d39ea815c71ddb7