Revert "Various minor policy fixes based on CTS."

This reverts commit 8a814a7604afd20f12c9ff3dcdae7d10e9b75f84

Change-Id: Id1497cc42d07ee7ff2ca44ae4042fc9f2efc9aad
diff --git a/file_contexts b/file_contexts
index d81d5a4..0d2db38 100644
--- a/file_contexts
+++ b/file_contexts
@@ -153,7 +153,7 @@
 /data/app(/.*)?		u:object_r:apk_data_file:s0
 /data/app/vmdl.*\.tmp	u:object_r:apk_tmp_file:s0
 /data/tombstones(/.*)?	u:object_r:tombstone_data_file:s0
-/data/local/tmp(/.*)?	u:object_r:shell_data_file:s0
+/data/local(/.*)?	u:object_r:shell_data_file:s0
 # Misc data
 /data/misc/bluetoothd(/.*)?	u:object_r:bluetoothd_data_file:s0
 /data/misc/bluetooth(/.*)?	u:object_r:bluetooth_data_file:s0