Merge "Add /file_contexts.bin only to devices which need it" am: 77dab1ed35
am: 47b3e3d92e

Change-Id: I739ae1146cde7826b8afe67252b67ec5366c08f0