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

Change-Id: I8aca668b1b024cb85df67be6bd803d14b7e42e8e