Merge changes from topic "am-1ad257edba1d4c33a1e88330a6640387"

* changes:
  Merge "[automerger skipped] Merge "Move android.jar defaults back to f/b" am: ebddedfd am: 52005fb6 am: ba08fc1d -s ours" into tm-dev am: cee8ebec -s ours am: 28344fbe -s ours
  [automerger skipped] Merge "Move android.jar defaults back to f/b" am: ebddedfd am: 52005fb6 am: ba08fc1d -s ours am: 849228e1 -s ours am: 01a90aef -s ours