Remove usage of hidden APIs Build.IS_DEBUGGABLE & XmlUtils am: 1416ac5cdc
am: ae6972d506

Change-Id: Id28bf6154041a8de64a11056f46eeea5ed52471e