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

Change-Id: Ib56202ae76ea431f60aba8135ec9c2762e79097e