am fb305664: Merge "should fix sdk build" into ics-mr1

* commit 'fb30566416499d441718af4bc9956404270f25ec':
  should fix sdk build