init: Fix memory corruption when sanitizing platform paths

This commit fixes code that incorrectly increments s when it
hits the terminator character of the string being sanitized.
This means it will randomly start trashing memory beyond the
end of the string being sanitized until it happens to hit two
NULs (\0\0) which will break it out of the loop.

Change-Id: I76553d7f183236a78a0bc7b408e92559b98f732f
system: Update function to calculate bytes per sample for offload

Update function to calculate bytes per sample for offload format

Change-Id: I46b78024293be959ad5d1db1f583933d2ab14576
Merge remote-tracking branch 'CM_android_system_core/cm-11.0' into cm-11.0