The new targets defined here ended up not being used for the purpose I had in mind -- delete them and move the android.jar defaults back to frameworks/base, where the only user now is. Test: m Merged-In: I9612c5c13ea38705ea949cf0836a790eafaf447f Change-Id: I9612c5c13ea38705ea949cf0836a790eafaf447f