Merge "[automerger skipped] Merge "Move android.jar defaults back to f/b" am: ebddedfd9b am: 52005fb6d0 am: ba08fc1d55 -s ours" into tm-dev