Merge "Add android.annotation.Hide"