Merge "Remove permission for APEX manifest." am: c3b3fdf8d6 am: dab41761f5
am: 37e101f320

Change-Id: I11dc585f11ecd96295610bf53a26d781cdd4cd37