Change target API from 17 to 18

Change-Id: I7adb61ad20740875e31a7e94b218aeb593e3b368
Fix several Lint's warnings

Change-Id: I8da5969d7fb2dd2bc2d0760e445da96470042598
Merge branch 'cm-10.2' into martincz