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

Change-Id: I6def5e7df892fe5d74ab58efaa898fc889549c31