Merge "Add flags to restorecon_recursive to traverse filesystems" am: 5fbd1cfd34 am: ffa3689107
am: a99490c813

Change-Id: I7a43cf1beacd79fcd2b1efbae57d7b857a1920ed