Merge changes Ib0a6c4a1,I3ee89d20

* changes:
  Set SDK version to be 21
  Update Refocus Test layout