Merge "Use filegroup to simplify Android.bp for frameworks and its friends" into stage-aosp-master