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