[automerger skipped] Merge "Remove obsolete include path from makefiles" am:...
[automerger skipped] Merge "Remove obsolete include path from makefiles" am: 4d454439 am: e88b66be -s ours
am: f4c49061 -s ours
am skip reason: change_id I6c29052b449099d4b0942b7fc0a7ae68d0dc1ba7 with SHA1 1ed007c1 is in history
Change-Id: I32fc2ed9bc97cacd7727b7acabf928c71665724c