Merge \"Merge \\\\\\\\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\\\\\\\"...

Merge \"Merge \\\\\\\\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\\\\\\\" into lmp-dev am: d5573715  -s ours am: f2fffc9f am: 047fb889 am: 9f7ef49d  -s ours am: 426708f0 am: 5affad8f am: c8950e29 am: df83abca  -s ours am: b6b00fc6 am: 4e49def3\" into nyc-mr1-dev-plus-aosp
am: e95b463c  -s ours

Change-Id: I70eedc246fe6d3ebc146445f8cafe32c70c81c8a