* Fix Android Package break * Without java fix -- pipeline should fail * With java fix, should pass now * address CR comments