* commit '36b5795fc9e9a2eed320a0d626bce44a8c231f6b': AAPT: Continuation of public/private attribute fix