move projects untouched in 4.3 back to aosp

Change-Id: I71e810ae7d3de02993910a9f17e22023e3f4f63a
fix repo upload

Change-Id: I0aa0fd1fb0c27db6099f9c9aa5657c332357af34