This reverts commit a63e69cf. Reason for revert: Remove mainline API for R Test: build Bug: 148174114 Change-Id: I712958984254ca6f16a9604d2aab532500dc1ca9