Sync generator script with manual Java changes

Incorporate manual changes to generated Java files back into the
generator.

Bug: 126352534
Bug: 124338141
Test: ./gen and check output has no commands for java files to be run.

Change-Id: Ie5f48d704b1485316718ae19b20016a08e688916