Revert "Le manifest derp"

This reverts commit 27f0dff80a66dc0ffe3501ef55c361d2f8f0c8d6.

Change-Id: I20a668ddc1a5a9d0e996a9eaba8b00e957f5ada9
Revert "TEMP:  switch to fresh AOSP bionic with pertinent commits rebased"

This reverts commit bf6d8d2f86b3bcd3cbc5d77db23a1fedd826fa02.

Change-Id: I16d6e64c2c52e28e51888db263a49e24e6875f1d
Merge "Revert "TEMP:  switch to fresh AOSP bionic with pertinent commits rebased"" into kk44