The current code generates a _optimized.bc regardlessly, so put back the original logic. Change-Id: I3f84d10934b3e983f5f828af8d0943449a6e1d94