in progress

Change-Id: I70b2221c9dc3a758ae30f1ead7d5a1824924f24b
in progress

Change-Id: If4c032ca7ea87db2d1c29cb0e9763e10a695780b
more reasonable first cut at java android

Change-Id: I9a1e4c8010137c6e6b97047e9a9055d8a1333590
Merge topic 'java-android' into master

b1017ada more reasonable first cut at java android
5dfe80a5 in progress
f0af35e8 in progress