Merge "Move TestAccessPointBuilder." into oc-dr1-dev
am: 80139bfc4d

Change-Id: I6d1ad70e691c5ef0712afa79a9c96160b6559cd5