Merge "Add support for secure system overlays.  (DO NOT MERGE)" into gingerbread