This reverts commit efd3e087. Reason for revert: IVrWindowManager.aidl is still used in frameworks/base Change-Id: Id52fb8cf482ea5ab141ebf6b304c12b18a9d8070