Android 4.2.1 release 1.2
Merge "gcc 4.6: don't reorder functions"