am 6ba052b4: (-s ours) am c1a564b1: Merge "Add support for secure system overlays.  (DO NOT MERGE)" into gingerbread

Merge commit '6ba052b4847d85831c38c9b8e2942cef4987e55b'

* commit '6ba052b4847d85831c38c9b8e2942cef4987e55b':
  Add support for secure system overlays.  (DO NOT MERGE)