Revert "Initial AOSP push of kk mr1.1"

This reverts commit f90fd7bda805107b6990a84f9b5bbed69176f933.