Merge "[AChoreographer] Move refresh rate callback headers into android"