Merge "Enable stripping of java debug information when required." am: d659f806e5 am: 8c485b6b0c
am: a1847ffedf

Change-Id: I085608da575941de51eea8bc8deb7067a3673dd3