Update manifests for AOSPA 3.96/JWR (mako+maguro)