DO NOT MERGE ANYWHERE. Remove all the extra accessor methods added by javac in support-fragment.
am: d293a3712e  -s ours

Change-Id: Ie3f8252a459fd2ed6f8518419b182b00eec039ed