Merge "Remove file_contexts.bin from non-A/B OTA package." am: 7a1ed9edef
am: f7b5d5fbaa

Change-Id: I9adb75f3d3149a59f8990af8451be88e665b980b