Revert "another fix && git push"

This reverts commit 1c3475819dbda1d82184b156c10c94337cbbd2f4.
Revert "fixup"

This reverts commit 67175745eb9885ab506e8de3f2c798bb576d8f5e.
Revert "hybrid manifest"

This reverts commit 1799380d94e6c6a6c7909fba45d880d8fbc0557b.
Revert "test run of revision=refs/tags/android-4.4_r1.2"

This reverts commit 89a78f6948f307c9a0dd082e0d9de8ec78a5d44b.