am 40e665a0: cleanup

Merge commit '40e665a015c67a8dd21838894a1634a3e101b760' into eclair-plus-aosp

* commit '40e665a015c67a8dd21838894a1634a3e101b760':
  cleanup