[automerger skipped] Merge "Replaced Build.IS_DEBUGGABLE" am: 81491a1265 am: 503ceb05ec am: 4220c8e086 -s ours
am skip reason: Change-Id If3ca3171f8c09552642e797fb0ce2d00ccacc999 with SHA-1 76c72ec002 is in history

Change-Id: I6543a5a3cceb53c8189cbc6e2dd065a15a7122c9