Android 4.3 release 2.1
Merge "gcc 4.6: don't reorder functions"