Merge "Add local preopt options for generating app image and profile" am: fea31c0b9e
am: c185f742e1

Change-Id: Ifbe9e3247a1aed1c63918fc79da180880efb2e6b