Update for AOSPA

They shouldn't have to specifiy aosp patches. Something is not working right. I am rebuilding now.

references # 221