Reverted some projects back to AOSP source