Fix include references for when building with O=

Bug: 19661035
Change-Id: I12f40b494609562cd9c8424d8bb50f67af8c7002
2 files changed