Merge changes from topic "ajm" into tm-dev

* changes:
  [automerge] Move android.jar defaults back to f/b 2p: f8f417e5cd
  Move android.jar defaults back to f/b