Merge "Disable LTO on -eng" am: 1918b39942
am: af3e763358

Change-Id: I5146424fc06ad7c62088a0ac6f957e0a02b0ec66