Merge changes I9b387da8,Iabeca8c4

* changes:
  Hard-code two build properties in build.prop
  Update init.rc and fstab to normal convention
tree: 9a56589a12300cb517be16c644741f33ec5648fb
  1. apex/
  2. authfs/
  3. compos/
  4. docs/
  5. launcher/
  6. microdroid/
  7. tests/
  8. virtualizationservice/
  9. vm/
  10. zipfuse/
  11. .clang-format
  12. PREUPLOAD.cfg