am 334a05a2: Clean up code in preparation for AOSP.

* commit '334a05a24a5e4c27d9318967987fb181530deaff':
  Clean up code in preparation for AOSP.