Cleanup for ApiImageRotate

Follows up Id15a92d19cda8256917e7e1e5ee4241012214102

Minor tweak to filerevert too

Change-Id: I742c854ebb97a5a1f954388be4b15f992fa93bd8
Merge "Cleanup for ApiImageRotate"