Merge "Remove objclean" am: 1d4b79dde2 am: beaa6df59f
am: b4773ae479

Change-Id: Ic4333c9a139afc6625408142549cec834b1f1c9a