Merge "AAPT: Filtering resource fix" into lmp-dev