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

Change-Id: Id43b680d5297ea0f3bcff3cbd42e6b16b50de167