hotspot2: rename classes to comply with API guideline am: a77809766c am: c4f4a1ac9e am: 9bddb8ccd8
am: 6c3bed61c9  -s ours

Change-Id: Id291951c26f5947622f7ce6520d7e343e9f3cf4e