Kitkat clean up.

* Remove aosp stuffs.
* Fix inheriting props.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>