Merge "Remove objclean"
am: 1d4b79dde2

Change-Id: I89d814220509513c5948a811bfcc75241de6b3cc