PA clean up.

* Remove aosp stuffs.
* Indenting.

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