Merge "Removes ASEC-related install flags" am: bcc2d60826 am: 29e7688434
am: 5933b05563

Change-Id: I0a42eab5a9364c010f8fa252f55550306d44eb40