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