Merge changes from topic 'debuggerd_snprintf'
am: fefda6b508

Change-Id: I8ea82692779d531c453b50ffd45309317e9a4f0f