Merge "Replaced Build.IS_DEBUGGABLE"
am: 81491a1265

Change-Id: I9403b17f0549afa584880bbc2d047d37d3d7b8ce