Update 4.4 AOSPA

Not strict upstream PA, but the 3.1 has provisions which makes that ok