android: fix makefile to build on AOSP

relative path seems could be buggy on aosp,
also some remains in include could make problems.

Change-Id: I4fcbf1bb8d7588d670e2fc5f8beb71397175c8bb
android: fix simple path for cm, add note for later

current AOSP (master) seems a bit different regarding
the variable $(TARGET_OUT_INTERMEDIATES)

Change-Id: I4a92743124950fadffcbff2b88f455db09a45d9e
Merge remote-tracking branch 'cm/cm-11.0' into HEAD