Add the appropriate @hide flag so we can build!

Change-Id: Id45f682287741badb13e256f6029c52820a068bd
Merge remote-tracking branch 'upstream/cm-11.0' into HEAD