Merge "Merge "When suid_dumpable == 2, set dumpable to 0 for apps" am: 659a1312" into stage-aosp-master