am 026e219f: am b22f6853: Merge changes I5a63fd61,I7c6f59fe

* commit '026e219f780a1d257e78fe80419a10655dc615a8':
  Support the setting of file security contexts in OTA and update packages.
  Pass the file_contexts configuration to mkyaffs2image and make_ext4fs.