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

Change-Id: Ic38ec845583e1b8e5351aec365da613b72d011e3