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

Change-Id: If09c1fd1d8c30d1763ef7534e042ef4e3839d1f0