Merge "Use filegroup to simplify Android.bp for frameworks and its friends" into stage-aosp-master am: b7162b936f am: 5db24005a6
am: 28bde2ffbb

Change-Id: I645f88e59c896261c5046b953252e36ea1f392bf