[automerger skipped] Merge "Remove obsolete include path from makefiles" am: 4d4544391f
am: e88b66be78 -s ours
am skip reason: change_id I6c29052b449099d4b0942b7fc0a7ae68d0dc1ba7 with SHA1 1ed007c1e1 is in history

Change-Id: Iee8c93ae9f30265131f6d09fa4b7eb3fbcd8466d