libselinux: android: use new platform & non-platform file contexts am: cdcfbf9046
am: d1cb68d60c

Change-Id: I6013b295bb11e6c50da198c05450d4dca335791c