Android 4.3 Release 3.1
Merge "gcc 4.6: don't reorder functions"