Merge "Remove generated java source post clean logic" am: f57aa792c3
am: 5208e4f473

Change-Id: I18c9cf7fa19346e08d25d9fcba3b5538a7bf1127