Merge "Always generate JIT mini-debug-info for debuggable apps."
am: 05dd001ace

Change-Id: I62f64b8350f7d636d229450cf7e8fe20890720fb