[automerger skipped] Merge "Don't pass empty profile to OatWriter" am: 9599ef5a7a
am: ef965a5d0a  -s ours

Change-Id: I06a94e5aee8724b87e2f986801806f477aac7ad4