Merge "Change reference to Build.IS_DEBUGGABLE"
am: 4d83e67433

Change-Id: I9c7e437b5dc291ce1eba6de37215bee5a1e64510