Upload pathces for AOSP

* display compile fixing
* power off charging fixing

Signed-off-by: Keven Liu <airk908@gmail.com>