am 3b4304ad: am 99917ca6: Save 4 MB of space.

Merge commit '3b4304ad7ad92404db8aca00cbbf5d58cfc8153c' into eclair-mr2-plus-aosp

* commit '3b4304ad7ad92404db8aca00cbbf5d58cfc8153c':
  Save 4 MB of space.