Merge "Move hiddenapi rules to Soong" am: af931e60dc am: aec5032673
am: 21a159ff99

Change-Id: Ifd46909fe4faf0a4127cb6ca8d1349ad7d48fcdc