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

Change-Id: Ib5a66afee6df3017c4ede1610729f66ac445b189